test-abi: use G_TEST_SRCDIR, G_TEST_BUILDDIR

There's no need to invent new variables for these.

Signed-off-by: Simon McVittie <smcv@debian.org>
Closes: #234
Approved by: cgwalters

diff --git a/Makefile-tests.am b/Makefile-tests.am
index 6016d03ca42de3cb1953a89cad438b8038383ef9..1bc1bc9038e9260d61a2801944143b14cd4820fe 100644 (file)
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -23,8 +23,6 @@ include $(top_srcdir)/buildutil/glib-tap.mk
 # include the builddir in $PATH so we find our just-built ostree
 # binary.
 TESTS_ENVIRONMENT += OT_TESTS_DEBUG=1 \
-       SRCDIR=$$(cd $(top_srcdir) && pwd) \
-       BUILDDIR=$$(cd $(top_builddir) && pwd) \
        GI_TYPELIB_PATH=$$(cd $(top_builddir) && pwd) \
        LD_LIBRARY_PATH=$$(cd $(top_builddir)/.libs && pwd) \
        PATH=$$(cd $(top_builddir) && pwd):$${PATH} \

diff --git a/tests/test-abi.sh b/tests/test-abi.sh
index a49f8d4b9705bef02b70535e7fb210c5ac15dd98..62af365284068c1aeb3299d711598167fc86e9f4 100755 (executable)
--- a/tests/test-abi.sh
+++ b/tests/test-abi.sh
@@ -21,8 +21,8 @@ set -euo pipefail
 
 echo '1..1'
 
-grep ' ostree_[A-Za-z0-9_]*;' ${SRCDIR}/src/libostree/libostree.sym | sed -e 's,^ *\([A-Za-z0-9_]*\);,\1,' | sort -u > expected-symbols.txt
-eu-readelf -a ${BUILDDIR}/.libs/libostree-1.so | grep 'FUNC.*GLOBAL.*DEFAULT.*@@LIBOSTREE_' | sed -e 's,^.* \(ostree_[A-Za-z0-9_]*\)@@LIBOSTREE_[0-9_.]*,\1,' |sort -u > found-symbols.txt
+grep ' ostree_[A-Za-z0-9_]*;' ${G_TEST_SRCDIR}/src/libostree/libostree.sym | sed -e 's,^ *\([A-Za-z0-9_]*\);,\1,' | sort -u > expected-symbols.txt
+eu-readelf -a ${G_TEST_BUILDDIR}/.libs/libostree-1.so | grep 'FUNC.*GLOBAL.*DEFAULT.*@@LIBOSTREE_' | sed -e 's,^.* \(ostree_[A-Za-z0-9_]*\)@@LIBOSTREE_[0-9_.]*,\1,' |sort -u > found-symbols.txt
 diff -u expected-symbols.txt found-symbols.txt
 
 echo 'ok'